Use vcpkgs for dependencies on Windows#3490
Merged
Magnus Edenhill (edenhill) merged 2 commits intomasterfrom Aug 12, 2021
Merged
Use vcpkgs for dependencies on Windows#3490Magnus Edenhill (edenhill) merged 2 commits intomasterfrom
Magnus Edenhill (edenhill) merged 2 commits intomasterfrom
Conversation
Magnus Edenhill (edenhill)
requested review from
Jing Liu (jliunyu) and
Matt Howlett (mhowlett)
| a.info.get('arch'), | ||
| a.info.get('bldtype')) | ||
| if 'toolset' not in a.info: | ||
| a.info['toolset'] = 'v120' |
Contributor
There was a problem hiding this comment.
wondering if this affects OOTB compatibility anywhere important, but 2015 was a long time ago...
Contributor
Author
There was a problem hiding this comment.
Yeah, I'm not completely sure either. But we'll find out
Matt Howlett (mhowlett)
approved these changes
Aug 12, 2021
Jing Liu (jliunyu)
approved these changes
Aug 12, 2021
Comment on lines
+42
to
+43
| #pragma comment (lib, "libcrypto.lib") | ||
| #pragma comment (lib, "libssl.lib") |
There was a problem hiding this comment.
The names of these libraries (the file names) depend on build configuration. For example, for debug build of OpenSSL with / for MSVC these libraries can be named as libcryptod.lib and libssld.lib.
The CMake project already uses FindOpenSSL module which finds correct libs itself:
Line 97 in 75c4314
so correct libraries should be added into linker options by CMake.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This addresses the zlib upgrade in #2934 and makes sure we'll have up-to-date dependencies going forward.
It also makes adding additional dependencies easier.